Merge from mainline.
authorXue Fuqiao <xfq@gnu.org>
Fri, 28 Feb 2014 03:05:03 +0000 (11:05 +0800)
committerXue Fuqiao <xfq@gnu.org>
Fri, 28 Feb 2014 03:05:03 +0000 (11:05 +0800)
commitd53f43477b78d17aaaee398b2e156f6f821a7475
tree9513287d4de969a4dab5d96896b61d42b4e408c5
parentdf52f8b0ceeea6f6c329c79b3620f56c8adbca92
parent4670779ba71a73fcfe5a753b67b9c2b1893dc123
Merge from mainline.